From c319839d8eaced155a4330a6cb0dfbd68b5156a1 Mon Sep 17 00:00:00 2001
From: Owen Taylor <otaylor@redhat.com>
Date: Wed, 21 Jun 2000 16:26:50 +0000
Subject: [PATCH] Finish the job Elliot started of removing font setting test
 for text

Wed Jun 21 12:24:28 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/testgtk.c (create_text): Finish the job Elliot started
	of removing font setting test for text widget. (Since text widget
	and GdkFont are not deprecated, and cause portability problems.)
---
 ChangeLog          |  6 ++++++
 ChangeLog.pre-2-0  |  6 ++++++
 ChangeLog.pre-2-10 |  6 ++++++
 ChangeLog.pre-2-2  |  6 ++++++
 ChangeLog.pre-2-4  |  6 ++++++
 ChangeLog.pre-2-6  |  6 ++++++
 ChangeLog.pre-2-8  |  6 ++++++
 gtk/testgtk.c      | 14 +++-----------
 tests/testgtk.c    | 14 +++-----------
 9 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 207c30323b..209aa509ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun 21 12:24:28 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/testgtk.c (create_text): Finish the job Elliot started
+	of removing font setting test for text widget. (Since text widget
+	and GdkFont are not deprecated, and cause portability problems.)
+
 Wed Jun 21 11:41:43 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 207c30323b..209aa509ff 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Wed Jun 21 12:24:28 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/testgtk.c (create_text): Finish the job Elliot started
+	of removing font setting test for text widget. (Since text widget
+	and GdkFont are not deprecated, and cause portability problems.)
+
 Wed Jun 21 11:41:43 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 207c30323b..209aa509ff 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Jun 21 12:24:28 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/testgtk.c (create_text): Finish the job Elliot started
+	of removing font setting test for text widget. (Since text widget
+	and GdkFont are not deprecated, and cause portability problems.)
+
 Wed Jun 21 11:41:43 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 207c30323b..209aa509ff 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed Jun 21 12:24:28 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/testgtk.c (create_text): Finish the job Elliot started
+	of removing font setting test for text widget. (Since text widget
+	and GdkFont are not deprecated, and cause portability problems.)
+
 Wed Jun 21 11:41:43 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 207c30323b..209aa509ff 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Jun 21 12:24:28 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/testgtk.c (create_text): Finish the job Elliot started
+	of removing font setting test for text widget. (Since text widget
+	and GdkFont are not deprecated, and cause portability problems.)
+
 Wed Jun 21 11:41:43 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 207c30323b..209aa509ff 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Jun 21 12:24:28 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/testgtk.c (create_text): Finish the job Elliot started
+	of removing font setting test for text widget. (Since text widget
+	and GdkFont are not deprecated, and cause portability problems.)
+
 Wed Jun 21 11:41:43 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 207c30323b..209aa509ff 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Jun 21 12:24:28 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/testgtk.c (create_text): Finish the job Elliot started
+	of removing font setting test for text widget. (Since text widget
+	and GdkFont are not deprecated, and cause portability problems.)
+
 Wed Jun 21 11:41:43 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c
diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index 04e6c0822a..5088f705d3 100644
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -5840,7 +5840,6 @@ create_text (void)
   GtkWidget *separator;
   GtkWidget *scrolled_window;
   GtkWidget *text;
-  GdkFont *font;
 
   FILE *infile;
 
@@ -5886,28 +5885,21 @@ create_text (void)
 
       gtk_text_freeze (GTK_TEXT (text));
 
-      font = NULL;
-
       for (i=0; i<ntext_colors; i++)
 	{
-	  gtk_text_insert (GTK_TEXT (text), font, NULL, NULL, 
+	  gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, 
 			   text_colors[i].name, -1);
-	  gtk_text_insert (GTK_TEXT (text), font, NULL, NULL, "\t", -1);
+	  gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, "\t", -1);
 
 	  for (j=0; j<ntext_colors; j++)
 	    {
-	      gtk_text_insert (GTK_TEXT (text), font,
+	      gtk_text_insert (GTK_TEXT (text), NULL,
 			       &text_colors[j].color, &text_colors[i].color,
 			       "XYZ", -1);
 	    }
 	  gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, "\n", -1);
 	}
 
-      /* The Text widget will reference count the font, so we
-       * unreference it here
-       */
-      gdk_font_unref (font);
-
       infile = fopen("testgtk.c", "r");
       
       if (infile)
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 04e6c0822a..5088f705d3 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -5840,7 +5840,6 @@ create_text (void)
   GtkWidget *separator;
   GtkWidget *scrolled_window;
   GtkWidget *text;
-  GdkFont *font;
 
   FILE *infile;
 
@@ -5886,28 +5885,21 @@ create_text (void)
 
       gtk_text_freeze (GTK_TEXT (text));
 
-      font = NULL;
-
       for (i=0; i<ntext_colors; i++)
 	{
-	  gtk_text_insert (GTK_TEXT (text), font, NULL, NULL, 
+	  gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, 
 			   text_colors[i].name, -1);
-	  gtk_text_insert (GTK_TEXT (text), font, NULL, NULL, "\t", -1);
+	  gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, "\t", -1);
 
 	  for (j=0; j<ntext_colors; j++)
 	    {
-	      gtk_text_insert (GTK_TEXT (text), font,
+	      gtk_text_insert (GTK_TEXT (text), NULL,
 			       &text_colors[j].color, &text_colors[i].color,
 			       "XYZ", -1);
 	    }
 	  gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, "\n", -1);
 	}
 
-      /* The Text widget will reference count the font, so we
-       * unreference it here
-       */
-      gdk_font_unref (font);
-
       infile = fopen("testgtk.c", "r");
       
       if (infile)
-- 
2.30.2